merge trunk
authorKenichi Handa <handa@m17n.org>
Mon, 4 Oct 2010 05:53:32 +0000 (14:53 +0900)
committerKenichi Handa <handa@m17n.org>
Mon, 4 Oct 2010 05:53:32 +0000 (14:53 +0900)

Trivial merge